Drop support for configure options that haven't been available in years.

diff --git a/GPSBabel.pro b/GPSBabel.pro
index b0651a34f69686ce94f8a6ed6e41b7a43cc73400..cad0bc9f1b77a2bccc09cc9770ca491b256facea 100644 (file)
--- a/GPSBabel.pro
+++ b/GPSBabel.pro
@@ -178,10 +178,8 @@ DEFINES += NEW_STRINGS
 # We don't care about stripping things out of the build.  Full monty, baby.
 DEFINES += MAXIMAL_ENABLED
 DEFINES += FILTERS_ENABLED
-DEFINES += PDBFMTS_ENABLED
 DEFINES += SHAPELIB_ENABLED
 DEFINES += CSVFMTS_ENABLED
-DEFINES += CET_WANTED
 
 # Creator insists on adding -W to -Wall which results in a completely
 # absurd amount of jibber-jabber on perfectly legally formed code.

diff --git a/config.h.in b/config.h.in
index 8cb52c5c4301e7f96ac204e5c634b3fd88e62ae2..4ec3a1e2b35975aff0ef8dd041e2a6047b323e34 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -3,9 +3,6 @@
 /* Define if building universal (internal helper macro) */
 #undef AC_APPLE_UNIVERSAL_BUILD
 
-/* 0 for most-used character sets */
-#undef CET_WANTED
-
 /* 1 to enable the CSV formats support */
 #undef CSVFMTS_ENABLED
 
@@ -93,9 +90,6 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* 1 to enable Palm PDB support */
-#undef PDBFMTS_ENABLED
-
 /* 1 to enable shapefile support */
 #undef SHAPELIB_ENABLED
 

diff --git a/configure b/configure
index 36312c6b2cd5f77f508215c9f4086da92622a041..524533f09e939eaf833fdb4398f6dfa61f681e9e 100755 (executable)
--- a/configure
+++ b/configure
@@ -646,7 +646,6 @@ QMAKE
 RC
 FILEINFO
 FMTS
-PALM_DB_CMT
 EGREP
 GREP
 CXXCPP
@@ -724,9 +723,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-with_cet
 enable_shapefile
-enable_pdb
 enable_csv
 enable_most
 enable_filters
@@ -1361,7 +1358,6 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-shapefile=(yes)|no
-  --enable-pdb=(yes)|no
   --enable-csv=(yes)|no
   --enable-most=(yes)|no
   --enable-filters=(yes)|no
@@ -1370,7 +1366,6 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-cet=(default,all,minimal)
   --with-zlib=(included)|system|no
   --with-doc=DIR        Path where the documentation will be stored.
 
@@ -4540,31 +4535,11 @@ _ACEOF
 fi
 
 
-
-# Check whether --with-cet was given.
-if test "${with_cet+set}" = set; then :
-  withval=$with_cet; cet="$withval"
-else
-  cet="default"
-fi
-
-
 if test $GCC = yes; then
  CFLAGS="$CFLAGS -Wall"
  CXXFLAGS="$CXXFLAGS -Wall"
 fi
 
-if test "$cet" = "all"; then
-
-$as_echo "#define CET_WANTED 1" >>confdefs.h
-
-fi
-if test "$cet" = "default"; then
-
-$as_echo "#define CET_WANTED 0" >>confdefs.h
-
-fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support shapefiles" >&5
 $as_echo_n "checking whether to support shapefiles... " >&6; }
 # Check whether --enable-shapefile was given.
@@ -4585,28 +4560,6 @@ $as_echo "yes" >&6; }
 $as_echo "no" >&6; }
     fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support Palm/OS pdb formats" >&5
-$as_echo_n "checking whether to support Palm/OS pdb formats... " >&6; }
-# Check whether --enable-pdb was given.
-if test "${enable_pdb+set}" = set; then :
-  enableval=$enable_pdb;  enable_pdb="$enableval"
-else
-  enable_pdb="yes"
-fi
-
-    if test "$enable_pdb" != "no" ; then
-
-$as_echo "#define PDBFMTS_ENABLED 1" >>confdefs.h
-
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-       PALM_DB_CMT=#
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support csv formats" >&5
 $as_echo_n "checking whether to support csv formats... " >&6; }
 # Check whether --enable-csv was given.

diff --git a/configure.in b/configure.in
index ffa67430c1341018955d5bef0aff37d9a2a5b4ad..ee4e9168eed5ed4415d697d9f80bc71c2214eeab 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -52,21 +52,11 @@ AC_C_BIGENDIAN
 # Checks for libraries.
 AC_CHECK_LIB([m], [cos])
 
-AC_ARG_WITH(cet,[  --with-cet=(default,all,minimal)],
-             cet="$withval", cet="default")
-
 if test $GCC = yes; then
  CFLAGS="$CFLAGS -Wall"
  CXXFLAGS="$CXXFLAGS -Wall"
 fi
 
-if test "$cet" = "all"; then
-   AC_DEFINE(CET_WANTED, 1, [1 for all character sets])
-fi
-if test "$cet" = "default"; then
-   AC_DEFINE(CET_WANTED, 0, [0 for most-used character sets])
-fi
-
 AC_MSG_CHECKING(whether to support shapefiles)
 AC_ARG_ENABLE(shapefile,
   [  --enable-shapefile=[(yes)|no]],
@@ -78,19 +68,6 @@ AC_ARG_ENABLE(shapefile,
        AC_MSG_RESULT(no)
     fi
 
-AC_MSG_CHECKING(whether to support Palm/OS pdb formats)
-AC_ARG_ENABLE(pdb,
-  [  --enable-pdb=[(yes)|no]],
-  [ enable_pdb="$enableval"],[enable_pdb="yes"])
-    if test "$enable_pdb" != "no" ; then
-        AC_DEFINE(PDBFMTS_ENABLED, 1, [1 to enable Palm PDB support])
-       AC_MSG_RESULT(yes)
-    else
-       PALM_DB_CMT=#
-       AC_MSG_RESULT(no)
-    fi
-AC_SUBST(PALM_DB_CMT)
-
 AC_MSG_CHECKING(whether to support csv formats)
 AC_ARG_ENABLE(csv,
   [  --enable-csv=[(yes)|no]],

diff --git a/csv_util.cc b/csv_util.cc
index 405838937c87cf9e6f84c1b0a7a4dfdd51884f12..9fe3d117d87faa7f40de83578cbbaca2e5cfac4b 100644 (file)
--- a/csv_util.cc
+++ b/csv_util.cc
@@ -157,12 +157,12 @@ in_word_set(register const char* str, register unsigned int len);
 /****************************************************************************/
 /* obligatory global struct                                                 */
 /****************************************************************************/
-XcsvFile xcsv_file;
 
 extern char* xcsv_urlbase;
 extern char* prefer_shortnames;
 
 #if CSVFMTS_ENABLED
+XcsvFile xcsv_file;
 static double pathdist = 0;
 static double oldlon = 999;
 static double oldlat = 999;

diff --git a/main.cc b/main.cc
index b5a1bdb0ed5c88714081267c901fa70722dbd736..ee3ac119a907cb385c3605f16bfb41671ea6717f 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -208,17 +208,10 @@ print_extended_info(void)
     "CSVFMTS_ENABLED "
 #endif
 
-#if PDBFMTS_ENABLED
-    "PDBFMTS_ENABLED "
-#endif
-
 #if SHAPELIB_ENABLED
     "SHAPELIB_ENABLED "
 #endif
 
-#if defined CET_WANTED
-    "CET_ENABLED "
-#endif
     "\n");
 }
 

diff --git a/msvc/GPSBabel.vcxproj b/msvc/GPSBabel.vcxproj
index 036dfd3dab3ca25af89d987747958886a884ef59..ea2ea8bbc1e8ae2324918d7c5ae96ba670bac4ff 100644 (file)
--- a/msvc/GPSBabel.vcxproj
+++ b/msvc/GPSBabel.vcxproj
@@ -74,7 +74,7 @@
       <Optimization>Disabled</Optimization>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;_DEBUG;_CONSOLE;HAVE_LIBEXPAT;MAXIMAL_ENABLED;FILTERS_ENABLED;PDBFMTS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;CET_WANTED;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;_DEBUG;_CONSOLE;HAVE_LIBEXPAT;MAXIMAL_ENABLED;FILTERS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -87,7 +87,7 @@
       <IntrinsicFunctions>false</IntrinsicFunctions>\r
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>\r
       <WholeProgramOptimization>true</WholeProgramOptimization>\r
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;NDEBUG;_CONSOLE;HAVE_LIBEXPAT;MAXIMAL_ENABLED;FILTERS_ENABLED;PDBFMTS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;CET_WANTED;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;NDEBUG;_CONSOLE;HAVE_LIBEXPAT;MAXIMAL_ENABLED;FILTERS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r

diff --git a/msvc/config.h b/msvc/config.h
index e1e698f2fcd56b78765001fd99bddfae379afb04..b5cd673b5a1e095fd186f8f4a072fd203e41af9f 100644 (file)
--- a/msvc/config.h
+++ b/msvc/config.h
@@ -8,9 +8,6 @@
 // Define to zero for the common UTF-8, ASCII and related sets.
 // Define to one for everything we know.
 
-/* 0 for most-used, 1 for all character sets */
-#define CET_WANTED 1
-
 /* 1 to enable as many formats as possible */
 #define MAXIMAL_ENABLED 1
 
@@ -20,9 +17,6 @@
 /* 1 to enable all the filters. */
 #define FILTERS_ENABLED 1
 
-/* 1 to enable Palm PDB support */
-#define PDBFMTS_ENABLED 1
-
 /* 1 to enable shapefile support */
 #define SHAPELIB_ENABLED 1